From 3365ba873b93149aa9c42c1f8290abd944fbda17 Mon Sep 17 00:00:00 2001 From: George Sapkin Date: Mon, 17 Nov 2025 10:37:59 +0200 Subject: [PATCH] vim: add actual xxd version Use the actual xxd version instead of the vim one for packaging. Add matching CI test. Signed-off-by: George Sapkin --- utils/vim/Makefile | 4 +++- utils/vim/test.sh | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/utils/vim/Makefile b/utils/vim/Makefile index 7726765178..60124b67a5 100644 --- a/utils/vim/Makefile +++ b/utils/vim/Makefile @@ -9,7 +9,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=vim PKG_VERSION:=9.1 -PKG_RELEASE:=1 +PKG_XXD_VERSION:=2023.10.25 +PKG_RELEASE:=2 VIMVER:=91 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 @@ -71,6 +72,7 @@ define Package/xxd CATEGORY:=Utilities TITLE:=make a hexdump or do the reverse URL:=http://www.vim.org/ + VERSION:=$(PKG_XXD_VERSION) endef define Package/vim-full/conffiles diff --git a/utils/vim/test.sh b/utils/vim/test.sh index 913b9c6b1f..0ef5041041 100644 --- a/utils/vim/test.sh +++ b/utils/vim/test.sh @@ -2,6 +2,9 @@ case "$1" in vim|vim-full|vim-fuller) - vim --version | grep "$2" + vim --version | grep -F "$2" + ;; + xxd) + xxd --version 2>&1 | grep -F "${2//./-}" ;; esac -- 2.30.2